From: Matthieu Gallien <matthieu.gallien@nextcloud.com>
Date: Thu, 12 Dec 2024 10:44:39 +0000 (+0100)
Subject: Merge pull request #7639 from nextcloud/bugfix/conflict
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~30^2^2~190
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=e5db1535eaabf952fcf4913b6a10fed88a0c3833;p=nextcloud-desktop.git

Merge pull request #7639 from nextcloud/bugfix/conflict

Include folders when displaying the local metadata about a conflict.
---

e5db1535eaabf952fcf4913b6a10fed88a0c3833